1765 box size um#1786
Draft
rtuck99 wants to merge 4 commits into
Draft
Conversation
|
Please add a label to this PR. This helps with generating helpful release notes. |
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## main #1786 +/- ##
==========================================
+ Coverage 93.03% 93.05% +0.01%
==========================================
Files 164 164
Lines 8931 8985 +54
==========================================
+ Hits 8309 8361 +52
- Misses 622 624 +2
🚀 New features to boost your workflow:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
DO NOT MERGE
Part 2 of a fix for #1765
Requires:
Link to dodal PR (if required): #XXX
(remember to update
pyproject.tomlwith the dodal commit tag if you need it for tests to pass!)Below is the parameter class Hierarchy for
GenericGridbefore this refactor:A note on changes
The internal parameter model has changed significantly and is now simpler.
The
GenericGridand subclasses portion of the parameter hierarchy is being removed and replaced withGridScanParamsandGridDetectionParams.detect_grid_and_do_gridscannow only requiresDiffractionExperimentWithSampleandGridDetectionParamsthe grid detection plan now return
GridScanParamsDiffractionExperimentWithSampleandGridScanParamsis all that is needed to perform a grid scan.The grid detection and grid scan plans are now properly genericised with type parameter
TParameterdenoting the concrete parameter type extendingDiffractionExperimentWithSample, so that it can be passed to the BeamlineSpecific portions and also deserialized in the callbacks.DiffractionExperimentWithSamplehierarchy now concentrates mainly on general-purpose diffraction parameters such as exposure timings, transmission fraction, and sample metadata.DetectorParamsis now decoupled from the gridscan parameter model, meaning it is no longer constructed when a property on the parameter model. Instead it is explicitly constructed in the experiment plan from the parameters, and passed in explicitly into the gridscan plan and to the callbacks.This means that many subclasses can be removed from the parameter model, and it is possible to run 2d, 3d, gridscans and grid detection in any combination without requiring modifications to the parameter model.
The rotation scan parameter model has not been changed; it still has a
detector_paramsproperty.Instructions to reviewer on how to test:
Checks for reviewer